From 9822891e483afb50ab76f6c1c7c813b84626b7aa Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 1 Jul 2014 13:15:51 +0800 Subject: [PATCH] MSVC Builds: Clean up Introspection Builds Since g-i 1.40.0 we are using the .lib file(s) to determine the DLL(s) that the introspection files should look for, instead of directly using the DLL(s) directly, so it is no longer necessary to make copies of the GDK .lib file to match the - convention when we are building the introspection files for GdkWin32. Remove that from the introspection build process as a result. --- build/gtk-introspection-msvc.mak | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak index ba6c4415fa..fe1fa3fd66 100644 --- a/build/gtk-introspection-msvc.mak +++ b/build/gtk-introspection-msvc.mak @@ -31,10 +31,6 @@ setgirbuildnev: @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) -win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib - @-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib... - @-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib - Gdk-$(APIVERSION).gir: gdk_list @-echo Generating Gdk-$(APIVERSION).gir... $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk \ @@ -50,7 +46,7 @@ Gdk-$(APIVERSION).gir: gdk_list -DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION \ --filelist=gdk_list -o $@ -GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib +GdkWin32-$(APIVERSION).gir: gdkwin32_list @-echo Generating GdkWin32-$(APIVERSION).gir... $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk \ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ @@ -105,7 +101,6 @@ all: clean: @-del /f/q *.typelib @-del /f/q *.gir - @-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib @-del /f/q gtk_list @-del /f/q gdkwin32_list @-del /f/q gdk_list -- 2.30.2